Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 11 Jan 2012 06:55:35 +0000 (22:55 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 11 Jan 2012 06:55:35 +0000 (22:55 -0800)

Trivial merge